Skip to content

Conversation

notriddle
Copy link
Contributor

Fixes #118549

@rustbot
Copy link
Collaborator

rustbot commented Mar 29, 2024

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 29, 2024
@rust-log-analyzer

This comment has been minimized.

@notriddle notriddle force-pushed the notriddle/include-str-span branch from 540785e to 1b73c7d Compare March 29, 2024 20:34
@rustbot
Copy link
Collaborator

rustbot commented Mar 29, 2024

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@notriddle notriddle force-pushed the notriddle/include-str-span branch from a21216f to 534e900 Compare March 30, 2024 00:57
@rust-log-analyzer

This comment has been minimized.

@notriddle notriddle force-pushed the notriddle/include-str-span branch from 534e900 to 1c41dd6 Compare March 30, 2024 01:28
@lcnr
Copy link
Contributor

lcnr commented Apr 3, 2024

r? compiler

@rustbot rustbot assigned pnkfelix and unassigned lcnr Apr 3, 2024
|
LL | let b: &[u8] = include_str!("file.txt");
| ----- ^^^^^^^^^^^^^^^^^^^^^^^^ expected `&[u8]`, found `&str`
| ----- ------------------------ in this macro invocation
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was a little nervous when I saw this that we were no longer printing the expected+actual types in the new output, but I expanded the diff and now see that the info is still present via a note that was in the previous output. Its a little more awkward to force people to look at the note to see this info, but its acceptable.

@pnkfelix
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 12, 2024

📌 Commit 1c41dd6 has been approved by pnkfelix

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#123204 (rustdoc: point at span in `include_str!`-ed md file)
 - rust-lang#123223 (Fix invalid silencing of parsing error)
 - rust-lang#123249 (do not add prolog for variadic naked functions)
 - rust-lang#123825 (Call the panic hook for non-unwind panics in proc-macros)
 - rust-lang#123833 (Update stdarch submodule)
 - rust-lang#123841 (Improve diagnostic by suggesting to remove visibility qualifier)
 - rust-lang#123849 (Update E0384.md)
 - rust-lang#123852 (fix typo in library/std/src/lib.rs)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ffea7e2 into rust-lang:master Apr 12, 2024
@rustbot rustbot added this to the 1.79.0 milestone Apr 12, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2024
Rollup merge of rust-lang#123204 - notriddle:notriddle/include-str-span, r=pnkfelix

rustdoc: point at span in `include_str!`-ed md file

Fixes rust-lang#118549
@notriddle notriddle deleted the notriddle/include-str-span branch April 12, 2024 19:22
flip1995 pushed a commit to flip1995/rust that referenced this pull request Apr 18, 2024
…an, r=pnkfelix

rustdoc: point at span in `include_str!`-ed md file

Fixes rust-lang#118549
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tricky rustdoc warning messages when using include_str
7 participants